From: Peter Wagner <​tripolar@gmx.at>
Date: Tue, 22 Oct 2013 13:09:28 +0000 (+0000)
Subject: openssh-server-pam: set options correctly in sshd_config when openssh-server-pam... 
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=09106b7e11aafbb2b71a2c2097d15fc35751eceb;p=openwrt%2Fsvn-archive%2Fpackages.git

openssh-server-pam: set options correctly in sshd_config when openssh-server-pam is used

Signed-off-by: Peter Wagner <tripolar@gmx.at>

SVN-Revision: 38495
---

diff --git a/net/openssh/Makefile b/net/openssh/Makefile
index 4b8a10e5d..cbc6db4c1 100644
--- a/net/openssh/Makefile
+++ b/net/openssh/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=openssh
 PKG_VERSION:=6.3p1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
@@ -220,6 +220,8 @@ define Package/openssh-server-pam/install
 	$(INSTALL_DIR) $(1)/etc/ssh
 	chmod 0700 $(1)/etc/ssh
 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/ssh/sshd_config $(1)/etc/ssh/
+	sed -i 's,#PasswordAuthentication yes,PasswordAuthentication no,g' $(1)/etc/ssh/sshd_config
+	sed -i 's,#UsePAM no,UsePAM yes,g' $(1)/etc/ssh/sshd_config
 	$(INSTALL_DIR) $(1)/etc/pam.d
 	$(INSTALL_DATA) ./files/sshd.pam $(1)/etc/pam.d/sshd
 	$(INSTALL_DIR) $(1)/etc/security